Imported Upstream version 2016.5
authorSimon McVittie <smcv@debian.org>
Sat, 16 Apr 2016 21:22:18 +0000 (22:22 +0100)
committerSimon McVittie <smcv@debian.org>
Sat, 16 Apr 2016 21:22:18 +0000 (22:22 +0100)

Trivial merge